From 9ca54953809957fe5777fa2990ea404aa5cb4eac Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 29 Mar 2019 00:24:54 +0100 Subject: [PATCH] reftests: Fix inherit-and-initial test Run gtk-builder-tool --3to4 over it. As the test cares about the "initial" and "inherit" CSS keywords, the actual widgets aren't that important. It's just important to have many of them. --- testsuite/reftests/inherit-and-initial.ref.ui | 1075 ++++++----------- testsuite/reftests/inherit-and-initial.ui | 1037 +++++----------- 2 files changed, 671 insertions(+), 1441 deletions(-) diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui index c4d9625643..e978c242c8 100644 --- a/testsuite/reftests/inherit-and-initial.ref.ui +++ b/testsuite/reftests/inherit-and-initial.ref.ui @@ -1,6 +1,4 @@ - - 100 50 @@ -16,11 +14,8 @@ - - - @@ -53,81 +48,60 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - False popup inherit - True - False vertical inherit - True - False inherit - True - False _File - True + 1 inherit - True - False _New inherit - True - False - True + 1 _Open inherit - True - False - True + 1 _Save inherit - True - False - True + 1 Save _As inherit - True - False - True + 1 inherit - True - False _Quit inherit - True - False - True + 1 @@ -137,203 +111,149 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False _Edit - True + 1 inherit - True - False Cu_t inherit - True - True - True + 1 + 1 _Copy inherit - True - False - True + 1 _Paste inherit - True - False - True + 1 _Delete inherit - True - False - True + 1 Checks & Radios inherit - True - False - True + 1 inherit - True - False _Check - True + 1 inherit - True - True - False - True + 1 _Check - True + 1 inherit - True - False - False - True + 0 + 1 _Check - False inherit - True - True - True - False - True + 1 + 1 _Check - False inherit - True - True - False - True + 1 _Check - False inherit - True - False - False - True + 0 + 1 _Check - False inherit - True - True - False - False - True + 1 + 0 + 1 inherit - True _Radio - True + 1 inherit - True - True - False - True + 1 _Radio - True + 1 inherit - True - False - False - True + 0 + 1 _Radio - False inherit - True - True - True - False - True + 1 + 1 _Radio - False inherit - True - True - False - True + 1 _Radio - False inherit - True - False - False - True + 0 + 1 _Radio - False inherit - True - True - False - False - True + 1 + 0 + 1 @@ -347,22 +267,16 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False _View - True + 1 inherit - True - False _Dark theme inherit - True - False - True + 1 @@ -372,22 +286,16 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False _Help - True + 1 inherit - True - False _About inherit - True - False - True + 1 @@ -399,115 +307,91 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False inherit - True - False Save - True + 1 document-save - True + 1 inherit - True - False Open - True + 1 document-open - True + 1 inherit - True - False - True + 1 inherit - True - False Find - True + 1 edit-find - True + 1 inherit - True - False - True + 1 inherit - True - False inherit - True - True + 1 • search... - - inherit - True - False 6 inherit - True - False vertical 4 inherit - True - False - True + 1 - False comboboxentry @@ -516,13 +400,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False - False - True + 0 + 1 - False • comboboxentry @@ -532,8 +413,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - True + 1 • entry @@ -541,9 +421,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False - True + 0 + 1 • entry @@ -551,41 +430,31 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False 20 inherit - True - False label inherit - True - False - False + 0 label inherit - True - True - • + 1 adjustment2 inherit - True - True - • + 1 @@ -593,247 +462,178 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False - True + 1 checkbutton inherit - True - True - False - True - True + 1 + 1 0 0 - 1 - 1 checkbutton inherit - True - True - False - True + 1 0 1 - 1 - 1 checkbutton inherit - True - True - True - False - True + 1 + 1 0 2 - 1 - 1 checkbutton inherit - True - False - True - False - True - True + 0 + 1 + 1 0 3 - 1 - 1 checkbutton inherit - True - False - True - False - True + 0 + 1 0 4 - 1 - 1 checkbutton inherit - True - False - True - True - False - True + 0 + 1 + 1 0 5 - 1 - 1 radiobutton inherit - True - True - False - True - True + 1 + 1 1 0 - 1 - 1 radiobutton inherit - True - True - False - True - True + 1 + 1 radiobutton1 1 1 - 1 - 1 radiobutton inherit - True - True - True - False - True - True + 1 + 1 + 1 radiobutton1 1 2 - 1 - 1 radiobutton inherit - True - False - True - False - True - True + 0 + 1 + 1 1 3 - 1 - 1 radiobutton inherit - True - False - True - False - True - True + 0 + 1 + 1 radiobutton3 1 4 - 1 - 1 radiobutton inherit - True - False - True - True - False - True - True + 0 + 1 + 1 + 1 radiobutton3 1 5 - 1 - 1 inherit - True - True 0 6 - 1 - 1 inherit - True - False + 0 1 6 - 1 - 1 @@ -843,8 +643,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False vertical @@ -852,55 +650,47 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 110 inherit - True - False vertical 4 togglebutton inherit - True - True - True + 1 + 1 togglebutton inherit - True - False - True - True + 0 + 1 + 1 togglebutton inherit - True - True - True - True + 1 + 1 + 1 togglebutton inherit - True - False - True - True - True + 0 + 1 + 1 + 1 inherit - True - False liststore1 0 @@ -914,9 +704,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False - False + 0 liststore1 1 @@ -930,25 +718,21 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - True - True + 1 + 1 inherit - True - True - True + 1 + 1 #31316867a09f inherit - True - False @@ -956,41 +740,31 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False vertical inherit - True - False vertical 4 inherit - True - False vertical 8 - True + 1 inherit - True - False 0.5 inherit - True - False 0.5 - True + 1 @@ -998,37 +772,31 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False inherit - True - False - True + 1 vertical - True + 1 inherit - True - True + 1 adjustment1 - False + 0 75 - False + 0 inherit - True - False - True + 0 + 1 adjustment1 - False + 0 75 - False + 0 @@ -1038,21 +806,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False - True + 1 inherit - True - False - True + 1 4 inherit - True - False vertical 0.5 @@ -1060,11 +822,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False vertical 0.5 - True + 1 @@ -1072,35 +832,31 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False - True + 1 4 100 inherit - True - True + 1 vertical adjustment1 - False + 0 75 - False + 0 100 inherit - True - False - True + 0 + 1 vertical adjustment1 - False + 0 75 - False + 0 @@ -1110,22 +866,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False vertical inherit - True - False link button inherit - True - True - True - True + 1 + 1 + 1 none http://www.gtk.org @@ -1135,24 +886,18 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - True + 1 inherit - True - True + 1 in inherit - True - False inherit - True - False Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam fringilla, est ut feugiat ultrices, elit lacus ultricies nibh, id commodo tortor nisi id elit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. @@ -1175,8 +920,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False expander @@ -1189,30 +932,21 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False vertical inherit - True - False vertical - True + 1 inherit - True - False - 0 in inherit - True - False 12 @@ -1222,10 +956,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False <b>In</b> - True + 1 @@ -1233,15 +965,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False - 0 out inherit - True - False 12 @@ -1251,10 +978,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False <b>Out</b> - True + 1 @@ -1262,14 +987,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False - 0 inherit - True - False 12 @@ -1279,28 +999,19 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False <b>Etched out</b> - True + 1 - - inherit - True - False - 0 etched-out inherit - True - False 12 @@ -1310,10 +1021,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False <b>Etched out</b> - True + 1 @@ -1323,33 +1032,27 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False vertical inherit - True - False vertical 4 150 inherit - True - True + 1 always in inherit - True - True + 1 liststore1 - False + 0 0 @@ -1394,14 +1097,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - True + 1 in inherit - True - True + 1 textbuffer1 @@ -1414,373 +1115,285 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit - True - False inherit - True - False 5 5 5 10 - True + 1 inherit - True - True + 1 - - inherit - True - False - vertical - - - - - - - - inherit - True - False - page 1 + + + + inherit + vertical + + + + + + + + inherit + page 1 + + - - False - - - inherit - True - False - vertical - - - - - + 1 - - - - - inherit - True - False - page 2 + + + inherit + vertical + + + + + + + + inherit + page 2 + + - - 1 - False - - - inherit - True - False - vertical - - - - - + 2 - - - - - inherit - True - False - page 3 + + + inherit + vertical + + + + + + + + inherit + page 3 + + - - 2 - False - - - 0 - inherit - True - True + 1 right - - inherit - True - False - vertical - - - - - - - - inherit - True - False - page 1 + + + + inherit + vertical + + + + + + + + inherit + page 1 + + - - False - - - inherit - True - False - vertical - - - - - + 1 - - - - - inherit - True - False - page 2 + + + inherit + vertical + + + + + + + + inherit + page 2 + + - - 1 - False - - - inherit - True - False - vertical - - - - - + 2 - - - - - inherit - True - False - page 3 + + + inherit + vertical + + + + + + + + inherit + page 3 + + - - 2 - False - - - 1 - inherit - True - True + 1 bottom - - inherit - True - False - vertical - - - - - - - - inherit - True - False - page 1 + + + + inherit + vertical + + + + + + + + inherit + page 1 + + - - False - - - inherit - True - False - vertical - - - - - + 1 - - - - - inherit - True - False - page 2 + + + inherit + vertical + + + + + + + + inherit + page 2 + + - - 1 - False - - - inherit - True - False - vertical - - - - - + 2 - - - - - inherit - True - False - page 3 + + + inherit + vertical + + + + + + + + inherit + page 3 + + - - 2 - False - - - 2 - inherit - True - True + 1 left - - inherit - True - False - vertical - - - - - - - - inherit - True - False - page 1 + + + + inherit + vertical + + + + + + + + inherit + page 1 + + - - False - - - inherit - True - False - vertical - - - - - + 1 - - - - - inherit - True - False - page 2 + + + inherit + vertical + + + + + + + + inherit + page 2 + + - - 1 - False - - - inherit - True - False - vertical - - - - - + 2 - - - - - inherit - True - False - page 3 + + + inherit + vertical + + + + + + + + inherit + page 3 + + - - 2 - False - - - 3 - - - 4 - inherit - True - False - - 5 - diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui index bbc3ac8e3f..c08b2d8a11 100644 --- a/testsuite/reftests/inherit-and-initial.ui +++ b/testsuite/reftests/inherit-and-initial.ui @@ -1,6 +1,4 @@ - - 100 50 @@ -16,11 +14,8 @@ - - - @@ -53,71 +48,49 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - False popup - True - False vertical - True - False - True - False _File - True + 1 - True - False _New - True - False - True + 1 _Open - True - False - True + 1 _Save - True - False - True + 1 Save _As - True - False - True + 1 - - True - False - + _Quit - True - False - True + 1 @@ -126,183 +99,128 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False _Edit - True + 1 - True - False Cu_t - True - True - True + 1 + 1 _Copy - True - False - True + 1 _Paste - True - False - True + 1 _Delete - True - False - True + 1 Checks & Radios - True - False - True + 1 - True - False _Check - True - True - True - False - True + 1 + 1 _Check - True - True - False - False - True + 1 + 0 + 1 _Check - False - True - True - True - False - True + 1 + 1 _Check - False - True - True - False - True + 1 _Check - False - True - False - False - True + 0 + 1 _Check - False - True - True - False - False - True + 1 + 0 + 1 - - True - + _Radio - True - True - True - False - True + 1 + 1 _Radio - True - True - False - False - True + 1 + 0 + 1 _Radio - False - True - True - True - False - True + 1 + 1 _Radio - False - True - True - False - True + 1 _Radio - False - True - False - False - True + 0 + 1 _Radio - False - True - True - False - False - True + 1 + 0 + 1 @@ -315,20 +233,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False _View - True + 1 - True - False _Dark theme - True - False - True + 1 @@ -337,20 +249,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False _Help - True + 1 - True - False _About - True - False - True + 1 @@ -361,105 +267,80 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False - True - False Save - True + 1 document-save - True + 1 - True - False Open - True + 1 document-open - True + 1 - - True - False - + - True + 1 - True - False Find - True + 1 edit-find - True + 1 - True - False - True + 1 - True - False - True - True + 1 • search... - - - True - False 6 - True - False vertical 4 - True - False - True + 1 - False comboboxentry @@ -467,13 +348,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False - False - True + 0 + 1 - False • comboboxentry @@ -482,287 +360,205 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - True + 1 • entry - True - False - True + 0 + 1 • entry - True - False 20 - True - False label - True - False - False + 0 label - True - True - • + 1 adjustment2 - True - True - • + 1 - True - False - True + 1 checkbutton - True - True - False - True - True + 1 + 1 0 0 - 1 - 1 checkbutton - True - True - False - True + 1 0 1 - 1 - 1 checkbutton - True - True - True - False - True + 1 + 1 0 2 - 1 - 1 checkbutton - True - False - True - False - True - True + 0 + 1 + 1 0 3 - 1 - 1 checkbutton - True - False - True - False - True + 0 + 1 0 4 - 1 - 1 checkbutton - True - False - True - True - False - True + 0 + 1 + 1 0 5 - 1 - 1 radiobutton - True - True - False - True - True + 1 + 1 1 0 - 1 - 1 radiobutton - True - True - False - True - True + 1 + 1 radiobutton1 1 1 - 1 - 1 radiobutton - True - True - True - False - True - True + 1 + 1 + 1 radiobutton1 1 2 - 1 - 1 radiobutton - True - False - True - False - True - True + 0 + 1 + 1 1 3 - 1 - 1 radiobutton - True - False - True - False - True - True + 0 + 1 + 1 radiobutton3 1 4 - 1 - 1 radiobutton - True - False - True - True - False - True - True + 0 + 1 + 1 + 1 radiobutton3 1 5 - 1 - 1 - - True - True - + 0 6 - 1 - 1 - True - False + 0 1 6 - 1 - 1 @@ -771,58 +567,48 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False vertical 110 - True - False vertical 4 togglebutton - True - True - True + 1 + 1 togglebutton - True - False - True - True + 0 + 1 + 1 togglebutton - True - True - True - True + 1 + 1 + 1 togglebutton - True - False - True - True - True + 0 + 1 + 1 + 1 - True - False liststore1 0 @@ -835,9 +621,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False - False + 0 liststore1 1 @@ -850,94 +634,73 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - True - True + 1 + 1 - True - True - True + 1 + 1 #31316867a09f - - True - False - + - True - False vertical - True - False vertical 4 - True - False vertical 8 - True + 1 - True - False 0.5 - True - False 0.5 - True + 1 - True - False - True - False - True + 1 vertical - True + 1 - True - True + 1 adjustment1 - False + 0 75 - False + 0 - True - False - True + 0 + 1 adjustment1 - False + 0 75 - False + 0 @@ -946,63 +709,51 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False - True + 1 - True - False - True + 1 4 - True - False vertical 0.5 - True - False vertical 0.5 - True + 1 - True - False - True + 1 4 100 - True - True + 1 vertical adjustment1 - False + 0 75 - False + 0 100 - True - False - True + 0 + 1 vertical adjustment1 - False + 0 75 - False + 0 @@ -1011,20 +762,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False vertical - True - False link button - True - True - True - True + 1 + 1 + 1 none http://www.gtk.org @@ -1033,21 +779,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - True + 1 - True - True + 1 in - True - False - True - False Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam fringilla, est ut feugiat ultrices, elit lacus ultricies nibh, id commodo tortor nisi id elit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. @@ -1069,8 +809,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False expander @@ -1082,27 +820,18 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False vertical - True - False vertical - True + 1 - True - False - 0 in - True - False 12 @@ -1111,24 +840,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False <b>In</b> - True + 1 - True - False - 0 out - True - False 12 @@ -1137,23 +859,16 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False <b>Out</b> - True + 1 - True - False - 0 - True - False 12 @@ -1162,24 +877,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False <b>Etched out</b> - True + 1 - True - False - 0 etched-out - True - False 12 @@ -1188,10 +896,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False <b>Etched out</b> - True + 1 @@ -1200,30 +906,24 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - False vertical - True - False vertical 4 150 - True - True + 1 always in - True - True + 1 liststore1 - False + 0 0 @@ -1267,13 +967,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True - True + 1 in - True - True + 1 textbuffer1 @@ -1284,335 +982,254 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - - True - False - + - True - False 5 5 5 10 - True + 1 - True - True + 1 - - True - False - vertical - - - - - - - - True - False - page 1 + + + + vertical + + + + + + + + page 1 + + - - False - - - True - False - vertical - - - - - + 1 - - - - - True - False - page 2 + + + vertical + + + + + + + + page 2 + + - - 1 - False - - - True - False - vertical - - - - - + 2 - - - - - True - False - page 3 + + + vertical + + + + + + + + page 3 + + - - 2 - False - - - 0 - - True - True + 1 right - - True - False - vertical - - - - - - - - True - False - page 1 + + + + vertical + + + + + + + + page 1 + + - - False - - - True - False - vertical - - - - - + 1 - - - - - True - False - page 2 + + + vertical + + + + + + + + page 2 + + - - 1 - False - - - True - False - vertical - - - - - + 2 - - - - - True - False - page 3 + + + vertical + + + + + + + + page 3 + + - - 2 - False - - - 1 - - True - True + 1 bottom - - True - False - vertical - - - - - - - - True - False - page 1 + + + + vertical + + + + + + + + page 1 + + - - False - - - True - False - vertical - - - - - + 1 - - - - - True - False - page 2 + + + vertical + + + + + + + + page 2 + + - - 1 - False - - - True - False - vertical - - - - - + 2 - - - - - True - False - page 3 + + + vertical + + + + + + + + page 3 + + - - 2 - False - - - 2 - - True - True + 1 left - - True - False - vertical - - - - - - - - True - False - page 1 + + + + vertical + + + + + + + + page 1 + + - - False - - - True - False - vertical - - - - - + 1 - - - - - True - False - page 2 + + + vertical + + + + + + + + page 2 + + - - 1 - False - - - True - False - vertical - - - - - + 2 - - - - - True - False - page 3 + + + vertical + + + + + + + + page 3 + + - - 2 - False - - - True - False - + -- 2.30.2